Merge "kernel-headers: update to AU293 kernel CLs am: 3a3245f25e am: 399210ef11" into oc-mr1-dev-plus-aosp
am: 4a981ba305

Change-Id: I9518f20d74e02d4ba9c2a117675392f6d0f87eb9