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