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 am: 9ee69ea3 am: bfc70188

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



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