am skip reason: Merged-In Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b with SHA-1 23821a69 is already in history

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



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