[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 38c839926e -s ours am: 46ae4f858d

Change-Id: Iefadd063303a1e31e152b3918efd108e0fac8c91