Merge changes from topic "presubmit-am-a67e3d8c902c42e892ab130d017ba1af" into sc-qpr1-dev am: 9d870328c9

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

Change-Id: Ic7e02cf21edfeaf5d48a803149d247e8485fffe2