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