Merge "Sleep softly on device close." into tm-qpr-dev am: 601df459 am: 39787adc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20738606



Change-Id: I61ec8d0c421d6a90277edcc82492068b951f5349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>