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