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

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

Change-Id: Ib8b43b9ab97ac61f03496671d75deb857eb8c08d