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

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

Change-Id: Ib717ea616df7947cb1b14fc583e60ea3c8407529