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

Bug: 148796256
Change-Id: I781bac3ebd5439d16bce6a76a3520adc51b78a02