Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47 am: ac181beb am: 88057873 am: 7fb29222

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

Change-Id: I972a01f07cc670c6578e4b80fa60e84cd73c14a3