Merge "Sometimes Screen does not wake up while receiving whatsapp video call"...

Merge "Sometimes Screen does not wake up while receiving whatsapp video call" am: 540962a6 am: 67bbb93d am: 72a09010

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



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