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: I09f03042a3a24e54f90c5a3b1ef4abb88ce227cd