[automerger skipped] Enable android:restoreAnyVersion am: a234e169 -s ours

am skip reason: Merged-In If1f37519b59159c5cd6fa49a3e23dcc85348336e with SHA-1 65e283dc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26561031



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