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