Merge "Merge "Fix get display from display context derived context not...
Merge "Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e35685 am: e50d17bf" into rvc-d1-dev-plus-aosp am: 3e1dd0d8
Change-Id: Iec084d98d556c345cb47829da7b4d06408a5d0c5