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