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

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



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