Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into cw-e-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72507870 b/28740702 am: bbdc2c0817 am: c94b59a6cf
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72507870 b/28740702 am: bbdc2c0817
  [RESTRICT AUTOMERGE]: CTS test for Android Security b/72507870 b/28740702