Merge "Merge "Don't override activity display adjustments with app config" into rvc-dev am: 10e5f365 am: f8f76352" into rvc-d1-dev-plus-aosp