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

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

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