Merge remote-tracking branch 'aosp/upstream-master' into merge-from-upstream-20190420 am: 22f554e9e4

Change-Id: I3c2395037444eff220d8ee818ed6cccf26edd8d4