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

Change-Id: I2c313260cb95acc8ef7fc1a416ede9faaf29a938