Merge "Merge "Do nothing when a finishing Activity configuration changed" into...

Merge "Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534 am: 3ff8feac" into tm-d1-dev-plus-aosp am: d7a33b89

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



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