Merge changes from topic "sc-telem-perm-rename" into sc-v2-dev-plus-aosp am:...

Merge changes from topic "sc-telem-perm-rename" into sc-v2-dev-plus-aosp am: 58ec6839 am: 2fcb7c4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17288267

Change-Id: Ie03158fd36407be782f7670b509712f4002708bf