[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa am: e477541e10 am: 234cc79182
am: 69c9751809

Change-Id: I9eff5c8c8b64c4b7a56639535df8ae348001863a
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/