[automerger skipped] Merge "Fix the problem that the turn_screen_on Activity...

[automerger skipped] Merge "Fix the problem that the turn_screen_on Activity does not draw." am: 76c76a86 am: 9f4f8fe7 -s ours

am skip reason: Merged-In I60b2da453da0ac5c4df6e5a1040defe4bfe726ec with SHA-1 c6c0d0da is already in history

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



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