Merge changes from topic "camera-compat-force-rotation" into tm-qpr-dev am: 13459ada

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



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