[automerger skipped] Merge "Add a @hide API to indicate 5G and DSDS conflict."...

[automerger skipped] Merge "Add a @hide API to indicate 5G and DSDS conflict." am: 88fed59c am: 835bf10d -s ours am: caefb25e -s ours am: 62c5a475 -s ours am: 1a1f9644 -s ours

am skip reason: Change-Id I79a8fda5b70a31acc365ebcbb03b73b20d2443fd with SHA-1 e92ce14e is in history

Change-Id: I1147297d7995ca7e95f12692092ce22801e5b7e5