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

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



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