Merge "Camera: Fix race between notifyDeviceStateChange and removeProvider" am: c9f2c53a47 am: 807f72bfad am: 2daf0cc97b

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

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