resolved conflicts for merge of 1a023f89 to klp-dev-plus-aosp

Change-Id: I61c3d1ea509adc54b85bb6bb11350b6c466a8608
tree: 27bbd3defd2852191160fe393c8c080d628c5263
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/