am edbe3812: am db4d9741: am a846c35d: am c7f01078: Merge commit \'09fd16c8\' into manualmerge

* commit 'edbe3812388acaa19855e90b5d99348190dd26fe':
  CTS test SELinuxDomainTest should be updated.