Merge "IMS: Intialize static association map before initializing native...

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

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



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