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

am skip reason: subject contains skip directive

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

Change-Id: Idd2715d7ffe1804788a626f8a42efc6bc62c4639