Merge changes from topic "presubmit-am-4d7b136761494a969d4880fe816d3198" into sc-qpr1-dev am: 0d26fb4c2e

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

Change-Id: I37962e30e8ee138f9234d57ccdc250bd5a1d5025