Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev
am: 614636e926

Change-Id: If95c56ec0f9d1e03c8d57ae8fda81ba2696b7405