Merge "Camera: Address device state listener delay" into udc-qpr-dev am: 41fc44e3 am: 64fb054b

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



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