[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 am: 6f0749b91f am: 23df259fed
am: 560afffdb6

Change-Id: Ic96d8f0233e47d8e5779a49731294e882548ceb6