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