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