Merge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev am: 8bd54d4592
am: 95ebdd359d  -s ours

Change-Id: I21baaf3035fc4efcd9498ed28368da579e24b3f0