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