Merge "Merge "Remove EnhancedEstimates isHybird flag from trigger condition"...

Merge "Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8e am: 308a7d84 am: ac4834c6" into tm-qpr-dev-plus-aosp am: f11a1192

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



Change-Id: Ifcdaa27002d6fdb6385e247a87ad0c4cdaab9a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>