Merge "Get rid of usage of Context#getDisplayNoVerify() in...
Merge "Get rid of usage of Context#getDisplayNoVerify() in SurfaceViewRequestReceiver" into rvc-dev am: f1a03e07 am: 32dcf775 am: 09d622e5
Change-Id: I78bcf2df6f3fc8ebcd613533cb933f13a687ad8d