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