Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev...

Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864 am: 1bfe8d56" into rvc-d1-dev-plus-aosp am: 9659bb9b

Change-Id: I247039e3a6413c8c585c9b4d8d70494c402c3f2e