tree c7225ef344d4661361a142729d464f2ce5f1d003
parent 48f6e8cc61d967e050631859d3f40e0119949a73
parent cfbeeb962564f4d20e16cc357f3637393ce3f85c
author Pengquan Meng <mpq@google.com> 1554158034 -0700
committer android-build-merger <android-build-merger@google.com> 1554158034 -0700

Merge "Enforce permission check before identity clear" am: e8777aec44 am: 09b9551f01
am: cfbeeb9625

Change-Id: Icf9b0a59a3447190986e72fa11f72c20347f4303