Merge "Use new powerHintAsync when available" into oc-dr1-dev
am: f54dbc5253  -s ours

Change-Id: Ic1ec1459c003c9a0c0f0c2a807b147a14a511af3