Merge "Merge "Disable AVB check in runtime vintf" am: 86c9951383 am: a241b4d488 am: 3a315ab982  -s ours"