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