Merge "Disable AVB check in runtime vintf"
am: 86c9951383

Change-Id: I70295f5685d18bed99822f4e712edfb6c2a1b280