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

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

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



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