[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 406ddd07ab am: a5eafb5abb -s ours
am skip reason: subject contains skip directive

Change-Id: I6930465256a904074be565ee2c75d94ce7695ab7