Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar""
am: 0156e0d255

Change-Id: Id57705c5c50bcb4dd5754762216176b3de781cb6