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

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



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