Merge "Use user doze whitelist in anomaly detection" into pi-dev am: d257c1a2d9
am: aeb5b38c52

Change-Id: Id75f81f42a2de2b459e6fd0c705e916324021959