Merge "Revert "Allow fabricated RROs to survive a reboot in non-user builds""...

Merge "Revert "Allow fabricated RROs to survive a reboot in non-user builds"" into main am: 7fe73e95 am: 9c6cd269

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



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