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

Change-Id: I46987eedb6dbed2c4a52acd650991864de43916c