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

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

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