Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04
authorBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Wed, 19 May 2021 11:28:16 +0000 (13:28 +0200)
committerBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Wed, 19 May 2021 11:28:16 +0000 (13:28 +0200)
* origin/imx_v2021.04:
  MA-19067 android: skip optee dtb node handling


Trivial merge