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