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

Change-Id: I9484e5763bf02e2236e40c538f0486288c3e45a4