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 am: d2e412e9

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



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