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