[automerger skipped] Merge "Fix DRM includes" into qt-r1-dev-plus-aosp am: 3820d19650
am: 55656ff75c -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1 a2eedd5d99 is in history

Change-Id: I0313a648ad9d872b3666bff54f638e63c50f3e75