Merge "Fix camera permission warning message not disappearing after permission...

Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: I2e6eea01803aa137b1a3e37892fe1ca1ce566a3b