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