Merge "Default overrideUserWhenGranting to false." into sc-dev am: 76b3f63497

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

Change-Id: If129cd505f4d3a165a310e18e7b76bb94fb51187