Merge "Remove incorrect annotation." into tm-dev am: 521df7493a am: 7914943a67

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

Change-Id: I3ed73a08947a3c729515bd4b6e2260000a5405bf