Merge "Fix strange pip size in horizontal expanded mode" into tm-dev am:...

Merge "Fix strange pip size in horizontal expanded mode" into tm-dev am: 42718971 am: 536be689 am: 756f97e0

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



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