Merge "CDD: "Clarify what are the conditions to be met in order       to be classified as hadware backed and secure hardware"." into nougat-dev am: 5deade678c am: cccf899295 am: 1f7d211904
am: 391d200a1c

Change-Id: I12aa2826cd6789eb95b443e63aa81f3341ebc4a4