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

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

Change-Id: I1e56abcef9715a3dd6a00d70cb815c4d9260175a