[automerger skipped] Remove non-SP based setLockCredentialInternal() am: 0566abd58c am: e024ab7105 am: 2f76c72161 -s ours
am skip reason: Merged-In Ieefffb2641f5c12dfcd7556f529830328e8ba292 with SHA-1 2dd97def29 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021756
Change-Id: Icc2b40528b90a9694b1fcc3d05d2601f4f12899b
This commit is contained in: