Merge "Update the API signature of ActivityManager#addOnUidImportanceListener" into main