Merge "Fix the problem that the turn_screen_on Activity does not draw." into...

Merge "Fix the problem that the turn_screen_on Activity does not draw." into tm-dev-plus-aosp am: 73bfd932 am: 8c672072 am: 68a81a2a

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



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