Merge changes from topic "tsuji-screenoff_0329" into tm-mainline-prod am: 9548c68d

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



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