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

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

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