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