Merge "docs: fixing errors found with lint check" into pi-dev am: 8c7d2142f6

am: 4d12f4c42b

Change-Id: I96a6dab05b6d4ea40950fe2ddc0948adf1b4e48f

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

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

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

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

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

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

diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge

diff --cc core/java/android/app/assist/AssistStructure.java
Simple merge