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