Merge "Revert "Camera: Fix race condition between initialize and statusCallback"" into rvc-qpr-dev am: c4ba40d49f am: f47673163d

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

Change-Id: I5a722654a5a48ee65fcc99fde6d21fb41617fada