Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2

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

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