Merge "Merge "Don't override activity display adjustments with app config"...

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

Change-Id: I453206bbc084be511a63b89ff4181fb01060cd88