Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174 Change-Id: Ia4544fef9ee7d7428d9c430da2b68fb2c820538d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>