Revert^2 "Remove references to keymint1"

34536a352803a08776cc4f373d93a94e1fcbf98e

Bug: 175345910
Bug: 171429297
Change-Id: I31351067ad9fa98a78a49dce8eb0d0ab4c98df3a
5 files changed