Merge "Add MAKE_UID_VISIBLE permission to the system api" into tm-dev