Merge "Disable failing PIP expand assertion" into tm-dev am: 03465b1e am: 64c12990 am: bd00db7e

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



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