[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa am:...

[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa am: a9f241bb -s ours am: 5ea7cd28 -s ours am: e39c9464 -s ours am: 0ab3426a -s ours

am skip reason: Merged-In Ifd87b5e38f341db4b34bf9f61480e29e49148846 with SHA-1 603f3ee7 is already in history

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

Change-Id: I14482e544408e664b0938906bd2c137b66fa18cb