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