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