Merge "framework-wifi-util-lib - compile against sdk level 30"