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 am: 196b55dd

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

Change-Id: I2f0d7598edeadd7d1f8a2f1705f8ff624256fc97