[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606

Change-Id: If096ea0d5c073cecf2e8e22a59b102702a42a15c
tree: 60d198c6bc42d67433853e97c225e2af7a0ad4bc
  1. tests/