Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619
am: e069b9dbd6

Change-Id: I11d192cab490a3b2cd90b053a2c5a8e195084598