Merge changes I98f7716d,I9b16934f,I78f15e21 into main

* changes:
  keystore2: rename the ScreenLockBound superencryption keys and type
  keystore2: rename the LskfBound superencryption key and type
  keystore2: rename values of UserState enum