Bug: 200221875 Bug: 205087705 Test: build for affected device Change-Id: Iae46291e1c28ff6a7b125d76f6f6727069ef18cb
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b