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