Merge remote-tracking branch 'origin/upstream' am: 15514ac8a6 am: 96e1e2f2fe

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

Change-Id: I30bfd5390d06fe7ae7d6da7802ecd3c176a1fd19
Signed-off-by: Automerger Merge Worker <[email protected]>