Bug: 285231003 Test: manual - on affected pages Change-Id: I83283fcc4b241596a8f0cdf5299417bce2810d0c
Bug: 238857896 Test: manual Change-Id: Ifc4ccc13271c42a0dd1941e8f26842afbe0411d6
Current strings are WIP, no entry point. Also updates a few remaining EXTRA_PERMISSION lines to EXTRA_PERMISSION_GROUP Test: build Bug: 194816787 Change-Id: I347b3011e1f51bd11dca92471ba8ba77e2d758e5