Merge "[security] Make frro iteration thread-safe" into tm-qpr-dev am: ed1e6ae4

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



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