Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9
am: 97d6427ab0

Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547