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