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

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



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