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

Change-Id: Ibca8a24b5b36b20de662fb94478e65ff04419fab