Add patch for 1.21.2

Bug: 55640
Change-Id: I04bd4398daf31d2f07825db17819e6654a8f3466