Merge "ServiceManagerNative: update for updatableViaApex" am: 0da4dcceea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682064

Change-Id: I82ff84c7742c68daeb5d4542859f01e2892c8288