Merge "APF: drop multicast ICMPv6 while in doze mode" am: 7880e284c8
am: f0ddd72f0f

Change-Id: I2827fc9159fe8d372d881451b9971ddcc4a0530f