[automerger skipped] Merge "Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: ba5a1aac05" into qt-r1-dev-plus-aosp
am: b280f8c717 -s ours
am skip reason: subject contains skip directive
Change-Id: I93125b792cabe4dfbca9a122ffc0da48ce5d2dd1
This commit is contained in: