Merge "Fix the bug where the added field into the toString implementation does...

Merge "Fix the bug where the added field into the toString implementation does not have a corresponding %s formatting." am: c477c679 am: 9484c11e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308089



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