Merge 6dc9ddef7d444b47327fda77dc77cdb025777723 on remote branch

Change-Id: I14e288093cd692992ba0edfd01ee5fd8164c0c33
tree: f900abb3ee77833dbd738b746f4af75d5c676426
  1. 1.2/
  2. 1.3/
  3. qmaa/
  4. excluded-input-devices.xml
  5. vibrator-vendor-product.mk