Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am: 7880e284c8 am: f0ddd72f0f" into pi-dev-plus-aosp
am: 7276ad54fc

Change-Id: Ibc546739cbbcaba635967bb95b91bb5b0a4068e2