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

Change-Id: Ic592e57469a26eda497da3d59e8c63d306371ffa