tree 090a787f751bcb3a67e0db8b890975638ba8a29d
parent e6e7a62cd74fc14a01e92d52d2a671b616e03679
parent d77cc961267fd6c816c70ddcd47cf5a7cb85d4f9
author Xin Li <delphij@google.com> 1646820139 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646820139 +0000

[automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours am: d77cc96126 -s ours

am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: I3e48708566265d7ab545766f6c26b27a78aad3f2