Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
am: 4605509b09
am: 835451cb23
Change-Id: I5591e1801370446e9ac49e839699491cd2898645
This commit is contained in: