Merge "Fix typo that leads to attention not working" into rvc-d1-dev am: 6469679e am: 7cd08292

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

Change-Id: I951693aa0e8ed3049b60276dbc291e14e625d726