Add android.Expand to expand $() variables in properties. Test: expand_test Bug: 31948427 Change-Id: Id30856a1d21d02e8997fcf2358e4a5feeede05be