[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
am: b6e9e08ae3
am: 6b5d026668
am: 7a2e7aac88
am: 9e31e01946
-s ours am: 7e8fa4b3ce
-s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I5057240366b73128a0231d9da65114fbbc40ac49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: