Merge "Improve rotationForActivityInDifferentOrientation." into tm-qpr-dev am: 2c2aeb0941 am: 8fa15b3ff7

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

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