Merge "Merge "cameraservice: Add metrics for extension sessions" into udc-dev am: 42b66ccf" into udc-dev-plus-aosp am: bd710309 am: 872d6569

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



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