Merge remote-tracking branch 'aosp/upstream-master' into pyserial

Bug: 228235300
Bug: 228457005
Test: TH

Change-Id: Ic7c3b0db59780c83ca9bffb2ad4b3dfbea0f8869