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