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