Revert "Telephony: Dont detach on-demand subscription during DDS switch to on-demand subscription."

This reverts commit a517d420f6475dcba13c7197b743c887af680eb3.
Revert "Add support for Flexi Mapping"

This reverts commit 04b90f5654a7c3696c6f14b7aaef386beabc5848.

Conflicts:
	src/java/com/android/internal/telephony/ModemBindingPolicyHandler.java
	src/java/com/android/internal/telephony/ModemStackController.java
	src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
	src/java/com/android/internal/telephony/SubscriptionController.java

Change-Id: Ie51079fdc8fbe8fb5f34342fa6247b6592742436