Revert^2 "Move keymint to android.hardware.security."

3d1d8409499201442daa5a58d90c33760edba81e

Bug: 175345910
Bug: 171429297
Change-Id: I3f96d11f7d49e48904ab2ba907ac1c616c0f9684
7 files changed