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