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: 16845bff

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



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