Merge "Fixes broken links when javadocs are rendered in the web." into udc-dev...

Merge "Fixes broken links when javadocs are rendered in the web." into udc-dev am: 959781a8 am: 7d95d06e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22683282



Change-Id: I039206b8c13d2c4ed2db9639e33503d8c29b7055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>