Merge "Add CtsDeviceInfo.apk to MTS to enable retry." into qt-dev am: 2b18137839 am: c6f23e8fc1 am: 466139871a
am: 317bf306ef

Change-Id: Ib5f5e31705d69830cc863e53a804e87ec15de13a