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