[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: f86273033c
am: f1e6a590a7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia3698c810a6f1970751ddffe8cdd7983ffdff815