[automerger skipped] Merge "Update orientation on rotation changes" into sc-dev am: b8a20acc am: ef267961 -s ours

am skip reason: skipped by user beverlyt

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

Change-Id: Iec96c94e0f57be2210a1bb0ed6309ae99af80bbc