Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to...

Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main am: dab4a553 am: b5d00aeb

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



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