[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be

Change-Id: I475e52bc05a9a602cb8d99fbf1468832686b69c0
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/