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

Change-Id: I8e84f13cf6f8f31ad96562acfce7d503b6b73304
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/