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