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

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



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