Bug: 140193672 Bug: 140192237 Test: VtsHalKeymasterV4_1TargetTest Change-Id: I488402079ebb3940e021ac1558aeee15c4b133c9 Merged-In: I488402079ebb3940e021ac1558aeee15c4b133c9