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

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



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