Merge "Wait for camera extensions service during initialization" into...

Merge "Wait for camera extensions service during initialization" into sc-qpr1-dev am: 2f68a663 am: 7544e779

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

Change-Id: I18772099f624c967494abcbb63a01d519ca0b9e2