Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2 am: e8a4750ac5 am: bb50f0e74c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: I3c1ba14ebf107ca37baa0c254be72ef3e0e755c1