Merge changes from topic "presubmit-am-d5c6ef964b1849ada3e1e87a6de8c167" into...

Merge changes from topic "presubmit-am-d5c6ef964b1849ada3e1e87a6de8c167" into sc-qpr1-dev am: 8587d6dd

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

Change-Id: I6f028039a26e756e3b4ba2328e0d70027e9895f8