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