[automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 11bc2924ab" into qt-r1-dev-plus-aosp
am: a998158cd2 -s ours
am skip reason: subject contains skip directive
Change-Id: I65ee3aceeadf2b1f3cb1af09ca5e2efa79c6ecf1
This commit is contained in: