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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I297ca3608c88128cd2a883e06075a46e4d4b426f