[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf

Change-Id: I36b8851f1859ecc728c4d28f8a8bcd346b7b6aaa
tree: 8279758a4550cfce624f11d4ff6d530872c9d758
  1. tests/