Merge "Fix a bug in build library: the uploaded file cannot be shown in table." am: 9b339b3bc1 am: 7eb899863a

Original change: https://android-review.googlesource.com/c/platform/development/+/1771647

Change-Id: Iccedafeeaa3efd0a6166f79919f84282b4420584