[automerger skipped] Merge "Move EnhancedEstimates to PowerModule" into tm-dev am: 7ee5bcf8 am: 0d878c5f am: c1104226 am: ea5a53e8 -s ours

am skip reason: skipped by user mankoff

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



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