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