Merge "Start platform compat service eariler." into stage-aosp-master am: 4535b04b33
am: f3fe588229

Change-Id: Ib3d6a1df3fd245a7e274bbf89976565dc9dcc577