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

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

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



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