Merge "Fix the bug where the added field into the toString implementation does not have a corresponding %s formatting." into tm-qpr-dev am: 4d334f4534

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

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