Merge "Use ro.build.version.release_or_codename to reconstruct fingerprint" am: 219b3487f8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1459042

Change-Id: Ie8e7929628ff1226d14156996bf54e41f2e813fe