Merge 9650bd8ce731adab1b440182db199be9fc39c39f on remote branch

Change-Id: Idd552c980ded867e211e7821afbe8073e3fbf483
tree: ff7602273eafcbab37c1ec2c084fb39a914826b9
  1. aidl/
  2. effect/
  3. excluded-input-devices.xml
  4. vibrator-vendor-product.mk