Merge "Allow bucket elevation for timed-out restricted apps." into sc-dev am:...

Merge "Allow bucket elevation for timed-out restricted apps." into sc-dev am: aa8f6da7 am: 7c103a89

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

Change-Id: I8cc4d3510e71f4b175cf11d64f20f8ecbf47f4f6