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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I559adbea15bef817f5f258e38597d169307c6f65