tree 6919aecb58ecd63664d180760849f81687dd51c4
parent c3a768efafb59d9b2f20214cdc7e0e13c3a99f33
parent 0da4dcceeae94ac347000889ea76401a27891f03
author Steven Moreland <smoreland@google.com> 1619037786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619037786 +0000

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

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

Change-Id: I82ff84c7742c68daeb5d4542859f01e2892c8288