[automerger skipped] Merge "atcmdfwd: framework matrix -> device matrix" am: fc54210685 am: dfc5936cd0 -s ours
am: 36c148ef49 -s ours
am skip reason: change_id I87e10fa56ac84ddd7e4210ac2bc4f1338265e1e9 with SHA1 2c0a3a0913 is in history

Change-Id: I938b1ecc2b23da92e3491e411e6844798d12862a