Android S Beta 5
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e3c9192408 -s ours am: f567cfaaf2 am: 6b5afd874d

Change-Id: I9ed765ca84294b11ac70286c735a76c5f236132a