Merge remote-tracking branch 'goog/upstream-master' into merge-apr-2021 am: 050b7cc0f7

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/pigweed/+/14241660

Change-Id: If15eda7229b82210d425dbb7f897d3dd49ea89e6