Merge "Unit test automation for Per-App API functionality" am: 3341199c33

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61ca9d447dd1bc602d2956f81ef8523fb45f0d7c