Merge "Update orientation on rotation changes" into sc-dev am: b8a20acc47

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

Change-Id: I5d91dfd5ac8b289cba0b1726b2e24344e4ab8886