[automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544  -s ours am: 9abaf8b016

Change-Id: I0cb1fce55bde4b99c4973dba5d73a5ac6fc2758d