[automerger skipped] Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b037 am:...

[automerger skipped] Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b037 am: 9a3cfbbb am: fd85bb9c -s ours am: 53fa571e -s ours

am skip reason: Change-Id I8888fae0037fd04e1668ab51eff91dd2bcb5e057 with SHA-1 675df994 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie00a0271fc06d96f0cb53a03608c7e50ebb74520