Merge "Change BuildVersionTest#testBuildFingerprint to limit passing to TAG: release-keys and VARIANT: user" into lmp-dev