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

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



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