Merge "Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev...

Merge "Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649 am: 66d53819" into rvc-d1-dev-plus-aosp am: 3bedc12c am: 47014bff

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

Change-Id: Idb5de8411706c58669dd02865c9cc4024b7f14bc