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