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