Merge "Fixes bad PIP state when opening Maps from the lock screen" into...

Merge "Fixes bad PIP state when opening Maps from the lock screen" into udc-dev am: 9dd34997 am: b62aba88

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



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