Merge "CDD: Clarified hardware-backed keystore requirement." into nougat-mr1-dev