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