Merge changes from topic "truncate operator name" am: ffa0f982 am:...

Merge changes from topic "truncate operator name" am: ffa0f982 am: 9cf73e36 am: eb897b1d am: 8827b928 am: 8ec131c2

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



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