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: I0a96be256c272e5402e0716306094a21e2c30ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>