Merge changes from topic "disable-avb-runtime-vintf"

* changes:
  Disable AVB check in runtime vintf
  Revert "Disable checking AVB in runtime vintf"