Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.031' into HEAD

AU_LINUX_ANDROID_KK.04.04.04.010.031 based on quic/aosp/kk

Change-Id: I417d831aa6b315fdbcdfc0dbaad663307560f49e