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