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 am: 6e647c71

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

Change-Id: I394274fbc0bf313f5d30fe22e0f5eff890b4d2da