Merge "Add TestApi annotation for isAidlHal()"