Merge "Merge "Fix AppOps estimation call time out." into rvc-dev am:...

Merge "Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47 am: 9662b11f am: d367370b" into rvc-qpr-dev-plus-aosp am: 82f033a1

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

Change-Id: Ib18d3d0e082bfec08afe47ae67b68b6189ad6eb1