[automerger skipped] Remove non-SP based setLockCredentialInternal() am: 0566abd58c am: e024ab7105 am: 2f76c72161 -s ours am: 4b6d839f4d -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: I8f880fdcfeff7d11298e33bf874fa57e20710466
This commit is contained in: