Fix @links in reference docs. am: 54de77470d

am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c

diff --cc core/java/android/app/ActivityManager.java
Simple merge

diff --cc core/java/android/widget/RemoteViews.java
Simple merge

diff --cc services/core/java/com/android/server/vr/VrManagerService.java
Simple merge

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge