Merge "Fix the flicker when entering PiP from Recents" into tm-qpr-dev am: 9e732e64

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



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