[automerger skipped] Merge "Add state keeper for global settings" into android13-tests-dev am: abdd6994e5 am: 7fa2c1d125 am: 70c86a69b9 am: 41f216742f -s ours

am skip reason: Merged-In I007a9f55337d872565e853203b70d9dbd35e13a4 with SHA-1 8d4f85cffd is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/2661538

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