Merge "Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6 am: e894efa9b6" into nyc-mr1-dev-plus-aosp