Merge remote-tracking branch 'hikey-aosp/mirror-android-4.19-stable' into meson-4.19

Change-Id: I70dd65e357ac9b23dacc0f2ca4773042104caade