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

Change-Id: Ia933ac4b8fb0d36c9e4b97ff69a0b35375439d09