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

* commit 'c42acaaf485364ff047be70fc51567ecceeec6b6':

Change-Id: I7bb1eaa7ecde5dde0ae07f0599beb112239f87f3