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

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

Change-Id: Ib79af9f626f4223bb21bcb70924a4c7b6421e088