Merge "Add intent for auto revoke UI" into rvc-dev am: e9b4b0009b am: d3573ee8c2

Change-Id: I322666bb295e216e4508f3a1b1bd1ec154300675