Bug: 322090587 Test: compare build.prop before and after, boot Change-Id: Iab157cf313d62c1c95ef66dd0a2b9563ee60ab46