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: Ibc90d7ddffee223d1752325d1d5017b0d211bfa5