[automerger skipped] Merge "Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as...
[automerger skipped] Merge "Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID." into qt-qpr1-dev-plus-aosp am: f9d07beb -s ours
am skip reason: Change-Id I5c28225d61996cb719ae384d7b0828776e84f8d5 with SHA-1 eebe2d7c is in history
Change-Id: Iae33a73b74472ff895588fd4947552893a47f87c