Merge "Disable failing PIP expand assertion" into tm-dev am: 03465b1e am: 524c0913

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



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