Merge "Replace impl ToString with impl Display" into main am: cd5daaf5ae

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3081943

Change-Id: I4435521d7a0fa1568bba8072205626e2f1467383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>