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

Change-Id: Ia1a84037f263de9a3002ec82de33864c72c7cc04