[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours am: 5ea7cd28fb -s ours
am skip reason: Change-Id Ifd87b5e38f341db4b34bf9f61480e29e49148846 with SHA-1 d3c01ef591 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44df4bb309bd00dc5f8094aefdb92484fc6cdb5c
This commit is contained in: