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

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

Change-Id: I6342a11b144b8e55765c5fa900f40a852a7db47c