Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
am: 0ee1e6d3c1

Change-Id: I8c22fb94b4e59426b8832a4bae5d2717090256d2