Merge "Ensure onStop before onPictureInPictureModeChanged" into udc-dev am: 00bcb90df3

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

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