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

Change-Id: Idc02c2d9e06104bb5136064ef861bda86802306a