[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours

am skip reason: skipped by user rubinxu

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcd777eb7f52719d447333a2fa1710f3338c01af