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: aa5757e7 am: 285c3726" into tm-qpr-dev-plus-aosp am: 56dcac41

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



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