Merge "Fix Dreams making media turn to PIP screen." into tm-qpr-dev am: faeae28e am: 869efc15

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



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