Merge changes from topic "am-32d7314f2e9a4c70a08474a31922eb0c"

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable" into tm-qpr-dev am: 701ed79631 am: 8512905f9e -s ours
  [automerger skipped] RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable am: a8a2f257cc am: 4b31ff28d9 -s ours
  Merge "Camera: Fix physical camera availability update" into tm-qpr-dev am: 608b9ec7bb am: 14048f1d8f