Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev