Merge "CameraServiceProxy: Estimate rotate&crop override value" into sc-v2-dev am: fc47105390 am: 1c3b2fa375

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

Change-Id: Iafde8c51246d160882d9d84ce7bb21a40623e7d5