Merge "Merge "Fix Maps PiP entrance to not bounce down and up" into udc-dev...

Merge "Merge "Fix Maps PiP entrance to not bounce down and up" into udc-dev am: 0a3b6523 am: c04b7a53" into udc-d1-dev-plus-aosp am: 8c55ab81

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



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