Merge v1.31 am: 8e49b95f8d

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

Change-Id: I2198361710484226c7bb04a8faefcf5448367327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>