[automerger skipped] Merge "DO NOT MERGE: fingerprint: Fix BuildFingerprint" into pie-cts-dev am: 36c35bf759 -s ours am: b9c646df50 -s ours am: 3e21acc176 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2019055

Change-Id: I2055f1ea05af56914d6c237e25a50c043a657393