Merge "Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2 am: 552c5af941" into nyc-mr1-dev-plus-aosp
am: dec2c0b3a0

* commit 'dec2c0b3a04379404083f5c4a357405f5c98dd65':

Change-Id: Ifbc632156d21b6628c6cb4c39680f63bb0963e7a