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