[automerger skipped] Merge "Clear identity when checking strongauth flags"...

[automerger skipped] Merge "Clear identity when checking strongauth flags" into rvc-qpr-dev am: 90c7090e am: fe3a20af -s ours

am skip reason: Change-Id Icb273fc0cf2ce1891550130539c0b2e6e788b533 with SHA-1 c88cd441 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12193571

Change-Id: I6bf36c3257f133921a0ed949294b1a9fa9aa641f