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