Merge tag 'AU_LINUX_ANDROID_KK.04.04.02.010.421' into HEAD

AU_LINUX_ANDROID_KK.04.04.02.010.421 based on quic/aosp/kk

Change-Id: I2d3ae6b15f13aeb9f087767b60fa040b05854fe3