Merge "Update setSimslotMapping TestCase" into stage-aosp-tm-ts-dev