[automerger skipped] Merge "Ensure onStop before onPictureInPictureModeChanged" into udc-dev am: 00bcb90df3 am: ba45b83534 -s ours am: 9026cad334 -s ours am: 9aad95d90c -s ours

am skip reason: Merged-In I0f94d4c26f7b3ccc1df6be97a0238f995438dffd with SHA-1 3dfe4c8e09 is already in history

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

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