am 5114444e: Merge "wifi-display: add certification options" into klp-dev

* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
  wifi-display: add certification options