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