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

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



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