[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for 5.1.4" into oreo-cts-dev am: 8f678b7905  -s ours am: 7b7c552bae
am: b788061496

Change-Id: Ibe0404e4e39c0a08506cedd00f9a5c94ac620d3e