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