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

Change-Id: I389d59b37b2dcb8051f60d245bb41dfc318eb01e