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