Merge "Implement app icon overlay when entering PiP" into tm-qpr-dev am: 55176db4 am: 6a59ef8f

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



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