Merge "WM: Build policy with DisplayAreaPolicyBuilder (5/n)"