[automerger skipped] Merge "Migrate PiP logs to UiEvent" into rvc-qpr-dev am:...

[automerger skipped] Merge "Migrate PiP logs to UiEvent" into rvc-qpr-dev am: 178e18a7 am: c593e6ad -s ours

am skip reason: Change-Id I805d16ae6f30c07270b743f7ae1e66cbbd121131 with SHA-1 c32b547d is in history

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

Change-Id: If7bac46f93148956624ab9b21ca7c0e84b5d857d