Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa6496 am: acc1ea43a5

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

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