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