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

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

Change-Id: I280e247caab09b0c2c12723f2f4b8952bf5c6778