Merge "Merge "Merge "Fix typo in permission name." into oreo-cts-dev am: 5293e78eff" into oreo-mr1-cts-dev am: 218c9f79e3" into pie-cts-dev