Merge "Merge "Fix typo in permission name." into oreo-cts-dev am: 5293e78eff" into oreo-mr1-cts-dev am: 218c9f79e3 am: 3d8664313a am: 5ceb0f594c am: 290338a0fd

Original change: https://android-review.googlesource.com/c/platform/cts/+/1346662

Change-Id: Id7baf25ab56817977c7920998b4584088f1d9c65