Merge changes from topic "am-1bc6dfdb03ce46beaef9bbdf6650a1d2" into tm-d1-dev-plus-aosp
* changes:
Merge "RESTRICT AUTOMERGE Ignore weak symbol difference in libui ABI check" into tm-dev am: 5f0d32a6 am: 5fc54489
RESTRICT AUTOMERGE Ignore weak symbol difference in libui ABI check am: 45913f2d am: f3e35bc9