Merge changes from topic "camera-compat" into sc-v2-dev am: 3486eacd am: 02a17e7b

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

Change-Id: Ic9916a3883eef0148a86c86149aa2e883fc56d1b