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 am: 966a4e4e am: c4a61021

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



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