Merge 7b51113fb33aa18bba39f1cf70cf211bbe417df5 on remote branch

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