Merge "Add support to the ActivityManager#addOnUidImportanceListener() to filter by uid" into main