Merge "Start platform compat service eariler." into stage-aosp-master