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