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

Change-Id: I9bb4939d3d9444b65d0d00b705fbd21cf4d6acbe