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: 706b3590 am: 8e942009 am: 63f4599c

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



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