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

Change-Id: I4345ff812fc128311a3e3ce5b2d46f25f50536fb