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