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

Change-Id: Iaa620c052a30243736043f82b4a5f03ae804c206