Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52
am: 85f5725fb5

Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30