[automerger skipped] Merge "Fix the bug where the added field into the...

[automerger skipped] Merge "Fix the bug where the added field into the toString implementation does not have a corresponding %s formatting." into tm-qpr-dev am: 4d334f45 am: d3466f39 -s ours

am skip reason: Merged-In Ib9c3ecadfc5a823cd4fcd44237b25900f86b4e5c with SHA-1 c6ba7aea is already in history

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



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