Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF Since the class 'android.security.KeyStore' is going away, the UID_SELF constant is being moved to a more appropriate location in KeyProperties. Update code that references this constant to use the new location. No change in behavior; the value of the constant remains the same. Bug: 326508120 Test: build Flag: NONE mechanical refactoring with no behavior change Change-Id: I7b00e03956098d980ec384836d3e00e64241ffbc