Add refresh logic for individually controlled permission in onResume. am: 8bb2553798
am: 30a7cef2f2

Change-Id: Ib773d56ac4547a21d12617fdde2072c78a92d908