[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 39e7509859
am: ba1932f601 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic5e8885bfbe7257dabe36dd11574c99bad0506c9
This commit is contained in: