Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev am: 1bc47a4c1d
am: 1f4f24d5bf

Change-Id: I52f7c4045090f3a6cf2b5ec322c22519fa50010f