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

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



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