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