DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master

Bug: 134405016
Change-Id: Ic9476705028119302bf717b2f8d0c0cd0cdc0cff
tree: bb7c0c90f67c9b39f8abf3158a0aaaac93a76799
  1. TestMediaApp/
  2. read-me.txt