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