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