[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18
-s ours
am skip reason: subject contains skip directive Change-Id: I6078067348010390012aa1ca5789ada3ab833b81
This commit is contained in: