[automerger skipped] [Settings/Archive] remove all checks for the archiving system property am: 844d2f4c67
-s ours
am skip reason: Merged-In I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e with SHA-1 6ae958abd2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26891534
Change-Id: I2998f064079c0a39bd554aeb3806b3174d03ed2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: