Merge "Fix race condition in displayservice." into oc-dev
am: 02e3c25f95

Change-Id: I2497f6867fa92f1d746d24c920ba62762b11b49b