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