Merge "Cleanup code for HAL based PNO" into oc-mr1-dev
am: e681c8a862

Change-Id: I3e83b2ea00f41a26df818c36bf9946ba03d6a8d4