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: eb353285

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

Change-Id: Ie982126b299f8aa7cd7c0c82507b37fbe2d0f10b