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