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