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