Merge changes from topic "presubmit-am-d71267990ba74361866edad10327b685" into sc-qpr1-dev am: 03a9259a5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/16518466

Change-Id: I9b59cefa5295bbc1fc29ff42380b92606cd5a2df