[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
am: df21617fed

Change-Id: Ic47dd0a300198bb02d4fbdf7f8d77a4b0eb2ab5b
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/