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