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