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

Change-Id: I0da56104f1223cf00b6cd847aa9c214df0dc0479