Merge "Add back keymaster@4.0 hash." into pie-vts-dev

am: 6a20e646e4

Change-Id: I72ce314c50518e1ff04b09ab947678c4f63fd261
This commit is contained in:
Steven Moreland 2018-08-20 17:33:46 -07:00 committed by android-build-merger
commit 472e5f4355

Diff content is not available