am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev
am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev

* commit '984cf41a54493d7fca5b499789ea5da5ad22b450':
  Have Pm return the correct code

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base