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

Bug: 148677254
Test: locally
Change-Id: I2149b1e5141f7f6311953a0c39386a5d53593eee