Merge "tempAllowList duration can be updated if an UID is already temp allowlisted." into sc-qpr1-dev am: add3a2e361

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15851148

Change-Id: I98beccce014373f5ccb43e76c7e6acfc76407301