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

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

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