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

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



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