Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5 am: ad3ab9f5 am: d96c2c88 am: f7beea85

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



Change-Id: I47778665443316e199f7f52e12b60ae1eed6dfdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>