Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5b7 am: 16845bff63 am: ba0300d6b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185202 Change-Id: I466aff1535cc8dfceff91efb9036650746eb9294 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: