[automerger skipped] Merge "Ensure onStop before...

[automerger skipped] Merge "Ensure onStop before onPictureInPictureModeChanged" into udc-dev am: 00bcb90d am: ba45b835 -s ours am: 9026cad3 -s ours

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

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



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