Merge changes from topic "camera-orientation-override" into tm-qpr-dev am:...

Merge changes from topic "camera-orientation-override" into tm-qpr-dev am: 00f12d74 am: d68a0a4b

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



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