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