Merge "Update Javadoc to make it clear how the new extra will be used by Dialer." into main