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