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