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

Change-Id: I28da24aaf125a8ada71b760c42e03ad7bef5bfcf
tree: 6b5eebb8d730724770759b68e0767d0c0618b1c7
  1. tests/