Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: d8947709a8 am: dd1f73de70
Change-Id: I70062e11c96964cfcada337cf3b8fdcd2dd708f5
This commit is contained in: