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

Change-Id: Ifa618f7955b30d541d4ba902d31effcfd48657d1