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

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

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