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

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



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