Merge "Update the javadoc of the ActivityManager#addOnUidImportanceListener()" into main