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

Change-Id: I7307099a8cc073932c094cafc2d988f45701ed3a