Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8e

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



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