Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am:...
Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d5 am: 23f35887 am: 9d27f4f3 am: e2eb2064
Change-Id: I65142f0c55afb930158573be76d6e6d05f3ad2dc