Merge "CDD: Clarified hardware-backed keystore requirement." into nougat-mr1-dev am: 83536f4d73 am: 06f0abad22
am: 8ab2128766

Change-Id: I593c0d90730a45900a06c70d117092401a48e319