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