Merge "RESTRICT AUTOMERGE Ignore weak symbol difference in libhidlbase ABI check am: 3697166a0a am: e2a8c428f8" into tm-d1-dev-plus-aosp