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
am: 3610398310

Change-Id: Ic18d751736e1b833b714519101d2a8bc4a33a0b7