Merge 5.4.206 into android11-5.4-lts

Changes in 5.4.206
	Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting"
	Linux 5.4.206

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iecbec19ddfa3ee5436a3feb3d89e92bfd30fc2c5