[conflict] Merge "Move EnhancedEstimates to PowerModule" into tm-dev am: 7ee5bcf8 am: 8bc8b345

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



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