Merge "CDD: Clarify the location where the Security Patch level's      are declared." into nougat-mr1-dev am: 84bc29a70f am: 0b42e3bec1
am: 6e3f685e5b

Change-Id: I734365173f5abaedeaa8ad56126c299a60962b84