[automerger skipped] Merge "[security] Make frro iteration thread-safe" into...

[automerger skipped] Merge "[security] Make frro iteration thread-safe" into tm-qpr-dev am: ed1e6ae4 am: 1d178b3b -s ours

am skip reason: Merged-In Ie585b6d113ebddee491c9ee433f070bed71a57cc with SHA-1 de47d0b9 is already in history

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



Change-Id: Ieae9b2270457bc769dca736b9684647860f4dfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>