Merge "Update "device admin apps" to "device admin"" into main