Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
am: b845700dee

Change-Id: I24183eed7028eca561fc5f0da80436e901bce3de