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