Merge "Allocate and de-allocate mStkService and mStkContext upon multi_config_change."
am: 135fada24b

Change-Id: I04525ea440856b84f4657080f95d7d6d30240321