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 am: 65b5b702

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

Change-Id: Iaba3e08058a21885ef42a5c9fed30949705b414a