Don't create nonplat_service_contexts on full_treble devices am: e83f1e56 am: 0d5bca44 am: e06f443c
am: f3a6adfd  -s ours

Change-Id: I442d4a9579393ffc5a4bfd284ddf9dcb4c633845