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

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



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