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