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