Don't load nonplat_service_contexts on full-treble. am: 57fdb1f490 am: 742d0341ad
am: 859fa65d07  -s ours

Change-Id: Ib099da7e4f9c78122b9b8532f077be0bee4f2629