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