am c0a8231: AI 148056: CTS: refactor failed cases in package android.con

Merge commit 'c0a82311ffcc841cad1b11d727c7c58979c21c07' into donut

* commit 'c0a82311ffcc841cad1b11d727c7c58979c21c07':
  AI 148056: CTS: refactor failed cases in package android.content.pm.
tree: 4be94d7248686d865cae7fb26c0bf0abd5eb4545
  1. tests/
  2. tools/
  3. Android.mk