Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa64 am:...

Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa64 am: acc1ea43 am: 002a7924

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



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