Merge "Allow OEMs to restrict access to secondary display" into pi-dev
am: 7ba60d25f3

Change-Id: I3b1a73a1a719a36af26f539ea79af8724b5010f1