Merge "surfaceflinger: prime shader cache for P3 conversion" into pi-dev am: b46d5b2d82
am: 61f2f02d8b

Change-Id: If268594660745dc28240c2064a6a62159d556e44