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