[automerger skipped] Merge "Ensure onStop before onPictureInPictureModeChanged" into udc-dev am: 00bcb90df3 am: 374edfcda0 -s ours am: 96ece2cb2f -s ours
am skip reason: Merged-In I0f94d4c26f7b3ccc1df6be97a0238f995438dffd with SHA-1 59c5d8101e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058285
Change-Id: I5b50d458e9b5380e617b89d8c81b464233d50374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: