Merge "Add AActivityManager UidImportance test"