Merge changes from topic "addsup"

* changes:
  [automerge] Add SuppressLint to framework-annotations-lib 2p: 2157c89792
  Add SuppressLint to framework-annotations-lib