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