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