Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b03781 am: 9a3cfbbb73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a61e2c74c0665a3b9b1f538cdbd5051db51ce8