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