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