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