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

Change-Id: I9ba5054974bd9b04ce5061a00cf6977a7dd6527e