Merge "Camera: Avoid caching extension service connections" into udc-qpr-dev am: fcfdb46537

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

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